# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1182+1.1069.303.1 -> 1.1183 # include/asm-ia64/page.h 1.7.1.3 -> 1.14 # include/asm-ia64/processor.h 1.16.2.6 -> 1.32 # include/linux/pci_ids.h 1.79 -> 1.80 # Makefile 1.262 -> 1.263 # diff -Nru a/include/asm-ia64/page.h b/include/asm-ia64/page.h --- a/include/asm-ia64/page.h Fri Mar 19 16:24:36 2004 +++ b/include/asm-ia64/page.h Fri Mar 19 16:24:36 2004 @@ -59,6 +59,7 @@ #endif #define RGN_MAP_LIMIT ((1UL << (4*PAGE_SHIFT - 12)) - PAGE_SIZE) /* per region addr limit */ + #ifdef __ASSEMBLY__ # define __pa(x) ((x) - PAGE_OFFSET) # define __va(x) ((x) + PAGE_OFFSET)